Replaced 'download folder' with 'synchronize', triggering the synchronization in two-ways of all the files in a folder #1109

davivel · 2015-08-24T08:58:15Z

No description provided.

davivel · 2015-08-24T08:59:09Z

Implemented, but pending of clean-up. I will comment again when development is finished.

davivel · 2015-08-24T10:52:26Z

Clean-up done. Ready to test & review.

cc @purigarcia & @masensio

davivel · 2015-08-24T10:52:54Z

Implements #3 (in manual mode)

davivel · 2015-08-24T12:13:57Z

@purigarcia , @masensio : rebased after last merges into master; ready to go again

masensio · 2015-08-24T12:22:57Z

src/com/owncloud/android/datamodel/FileDataStorageManager.java

-                }
-            }
-            */
-        //}


FileDataStorageManager.java is cleaner. 👍

masensio · 2015-08-25T08:41:23Z

Awesome job!!

Code review done.
Merge pending until the validation will be finished.

davivel · 2015-09-15T07:34:47Z

Delayed to next release due to problem not detecting some conflicts

strugee · 2015-09-21T03:20:47Z

Delayed to next release

Is the date for this written down somewhere? I know there's the GitHub Milestones, but they don't say (AFAIK) when releases will be shipped.

I was really, really looking forward to having this feature, and it'd be nice to know when it's expected.

davivel · 2015-09-21T06:44:37Z

MIlestones have a date, though it's not as easy to find as should:

https://github.com/owncloud/android/milestones

In this view dates are listed below the milestone names.

strugee · 2015-09-22T04:08:02Z

@davivel thanks, I appreciate it.

…igger uploads

…llow its use while the new SyncFolderOperation gets stable

…ng or uploading any file inside

…files and folders

… of files

…ot anymore)

…han the last known

Conflicts: src/com/owncloud/android/providers/FileContentProvider.java

… old cancel upload

rperezb · 2015-10-07T07:36:24Z

There is a bug here, in case there is a conflict, it´s not possible to fix the conflict
STEPS TO REPRODUCE IT

Go to the Desktop Client and create a new account (user1)
Create a new folder (e.g Hello) on the Desktop cliente
Go to the folder (Hello) and create a new File (e.g Hola)
Open the file and write something, Save
Go to the mobil
Go to the mobil with the same account (user1)
Waiting to sync
Go to the file
Download the file
Go to the Desktop client
Open the file, write and save
Go to the mobil (do not upload)
Open the file, write and save
Select to sync file (You can see File Conflict)
If you select the Local Version Option

tobiasKaminsky · 2015-10-07T16:24:09Z

@rperezb There is something missing in your test description, or? Point 15 ends in the middle of the sentence.

Conflicts: owncloud-android-library src/com/owncloud/android/files/services/FileUploader.java

…lict

…_save_local_version Fixed "Select Local Version" or "Keep Both behaviour" in conflict dialog

davivel · 2015-10-30T13:01:18Z

Bug fixed in #1219.

Aaaaand, please @Dianafg76

davivel · 2015-10-30T13:03:47Z

That's it.

Dianafg76 · 2015-10-30T13:04:00Z

I tested with Nexus 9 v6.0 and Android Galaxy S3 v 4 and is working OK

masensio · 2015-10-30T13:12:19Z

Waiting for Travis :)

Replaced 'download folder' with 'synchronize', triggering the synchronization in two-ways of all the files in a folder

davivel changed the title ~~[WIP] Replaced 'download folder' with 'synchronize', triggering the synchronization in two-ways of all the files in a folder~~ Replaced 'download folder' with 'synchronize', triggering the synchronization in two-ways of all the files in a folder Aug 24, 2015

davivel added this to the 1.8-current milestone Aug 24, 2015

davivel mentioned this pull request Aug 24, 2015

Minor changes to support synchronization of full folders in OC app owncloud/android-library#83

Merged

davivel added the ReadyToTest label Aug 24, 2015

davivel force-pushed the sync_full_folder branch from 1254acb to de93f92 Compare August 24, 2015 12:13

masensio reviewed Aug 24, 2015
View reviewed changes

src/com/owncloud/android/datamodel/FileDataStorageManager.java

}

}

*/

//}

Copy link

masensio Aug 24, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FileDataStorageManager.java is cleaner. 👍

davivel force-pushed the sync_full_folder branch from de93f92 to 58661c6 Compare August 28, 2015 16:19

davivel added the 2 - Working label Sep 2, 2015

davivel force-pushed the sync_full_folder branch from 58661c6 to 2d3919d Compare September 7, 2015 09:21

davivel modified the milestones: 1.8.1-next, 1.8-current Sep 15, 2015

davivel added 10 commits September 25, 2015 15:13

Extend SyncFolderOperation to check local changes of all files and tr…

ac68569

…igger uploads

Keep the old operation to sync folder as DownloadFolderOperation to a…

0162d2f

…llow its use while the new SyncFolderOperation gets stable

Added icon for files synchronizing; folders use it whenever downloadi…

e885c78

…ng or uploading any file inside

Rewritten queue of FileUploader based on IndexedForest

68b52dd

Join cancelation of downloads and uploads in 'cancel sync', both for …

9b5506f

…files and folders

Fixed NullPointerExceptionS in upload cancelations

c0c52fa

ETag used to detect changes in remote files (not only in folders)

5f41bb1

Persist conflicts in local database and show with an icon in the list…

e6c1454

… of files

Added conflict icon to folders containing files with conflicts

a2aa047

Removed conflict badge when conflict is solved

7399508

davivel added 3 commits September 25, 2015 15:13

Removed some logs

7d7767a

Updated error message for failed folder synchronization ('download' n…

056b7c9

…ot anymore)

Updated reference to library after rebase

fb482fa

davivel force-pushed the sync_full_folder branch from 2d3919d to fb482fa Compare September 25, 2015 13:20

davivel and others added 4 commits September 28, 2015 11:21

Upload operations end in conflict if overriding a version different t…

001801a

…han the last known

Merge branch 'master' into sync_full_folder

9494620

Conflicts: src/com/owncloud/android/providers/FileContentProvider.java

Use SYNC_CONFLICT instead CONFLICT for conflicts in UploadFileOperation

08d0205

Fix: Long press menu shows two extra options: old cancel download and…

8f67624

… old cancel upload

rperezb removed the ReadyToTest label Oct 7, 2015

rperezb mentioned this pull request Oct 13, 2015

Material buttons and checkboxes #1090

Merged

davivel mentioned this pull request Oct 15, 2015

Different ETag vs. OC-ETag handling in sync-client owncloud/client#3946

Closed

LukeOwlclaw mentioned this pull request Oct 21, 2015

Automated synchronization of folders (scope: inside 'owncloud' folder) #1136

Closed

44 tasks

masensio and others added 4 commits October 27, 2015 08:52

Merge branch 'master' into sync_full_folder

b9ef747

Conflicts: owncloud-android-library src/com/owncloud/android/files/services/FileUploader.java

Fix Select Local Version or Keep Both behaviour when solving file cof…

bcfa07f

…lict

Detect conflict when local and server version are changed

3444d61

Merge pull request #1219 from owncloud/sync_full_folder__fix_conflict…

09a3493

…_save_local_version Fixed "Select Local Version" or "Keep Both behaviour" in conflict dialog

Dianafg76 added the Approved by qa label Oct 30, 2015

davivel added 5 - To release and removed 2 - Developing labels Oct 30, 2015

Update library reference, sync_full_folder

9b95d53

masensio pushed a commit that referenced this pull request Oct 30, 2015

Merge pull request #1109 from owncloud/sync_full_folder

eaa0612

Replaced 'download folder' with 'synchronize', triggering the synchronization in two-ways of all the files in a folder

masensio merged commit eaa0612 into master Oct 30, 2015

masensio deleted the sync_full_folder branch October 30, 2015 13:14

rperezb mentioned this pull request Nov 5, 2015

Two-way file sync for specific folders or files. #3

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Replaced 'download folder' with 'synchronize', triggering the synchronization in two-ways of all the files in a folder #1109

Replaced 'download folder' with 'synchronize', triggering the synchronization in two-ways of all the files in a folder #1109

davivel commented Aug 24, 2015

davivel commented Aug 24, 2015

davivel commented Aug 24, 2015

davivel commented Aug 24, 2015

davivel commented Aug 24, 2015

masensio Aug 24, 2015

masensio commented Aug 25, 2015

davivel commented Sep 15, 2015

strugee commented Sep 21, 2015

davivel commented Sep 21, 2015

strugee commented Sep 22, 2015

rperezb commented Oct 7, 2015

tobiasKaminsky commented Oct 7, 2015

davivel commented Oct 30, 2015

davivel commented Oct 30, 2015

Dianafg76 commented Oct 30, 2015

masensio commented Oct 30, 2015

Replaced 'download folder' with 'synchronize', triggering the synchronization in two-ways of all the files in a folder #1109

Replaced 'download folder' with 'synchronize', triggering the synchronization in two-ways of all the files in a folder #1109

Conversation

davivel commented Aug 24, 2015

davivel commented Aug 24, 2015

davivel commented Aug 24, 2015

davivel commented Aug 24, 2015

davivel commented Aug 24, 2015

masensio Aug 24, 2015

Choose a reason for hiding this comment

masensio commented Aug 25, 2015

davivel commented Sep 15, 2015

strugee commented Sep 21, 2015

davivel commented Sep 21, 2015

strugee commented Sep 22, 2015

rperezb commented Oct 7, 2015

tobiasKaminsky commented Oct 7, 2015

davivel commented Oct 30, 2015

davivel commented Oct 30, 2015

Dianafg76 commented Oct 30, 2015

masensio commented Oct 30, 2015